Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for updated vcpkg #3

Merged
merged 17 commits into from
Jul 15, 2022
Merged

Support for updated vcpkg #3

merged 17 commits into from
Jul 15, 2022

Conversation

omartijn
Copy link
Collaborator

No description provided.

mcmtroffaes and others added 17 commits July 11, 2022 16:33
* [ffmpeg] do not pull in postproc for LGPL build

* [ffmpeg] disable avisynthplus on static builds (as it is not functional)

* [ffmpeg] bump port version

* [ffmpeg] x-add-version
* [ffmpeg] enable opengl feature on osx

* [ffmpeg] x-add-version

* [ffmpeg] remove opengl osx check in portfile

* [ffmpeg] x-add-version

* Update ports/ffmpeg/portfile.cmake

Co-authored-by: NancyLi1013 <[email protected]>

* [ffmpeg] x-add-version

* [ffmpeg] bump port version

* [ffmpeg] x-add-version

Co-authored-by: NancyLi1013 <[email protected]>
Co-authored-by: Billy Robert O'Neal III <[email protected]>
* [ffmpeg] fix cross compilation on mac arm64 to x86_64

* Bump port-version

* Bump port-version again.

Co-authored-by: Billy Robert ONeal III <[email protected]>
* [ffmpeg] update to 4.4.1

* Update version database

* update version

* update version

Co-authored-by: Jonliu1993 <[email protected]>
* Update tool to 2021-11-24.

* Reformat ports affected by microsoft/vcpkg-tool#282
* [vcpkg baseline][ffmpeg] Fix dependency alsa

* version

* fix option name

* version

* Apply suggestion

* version
* [ffmpeg] Update dependency support for recent changes.

Updates for changes in commits:
7bb175e [aom/libavif] Add support for ARM and UWP
a8204d9 [fribidi] Support new platform

* update

* [ffmpeg] update x264 supports.

* Fix version database.

* update

* Update all platform checks and error messages

* Update vcpkg.json

* Update ffmpeg.json

* fixup osx.

* another osx fixup

Co-authored-by: Billy Robert O'Neal III <[email protected]>
…(#20464)

* Update HTTP to HTTPS links where it can be done safely.

This means that the HTTP-based link gave a 200 response with identical
content to the HTTPS version of the link. For links containing
variables, we checked the interpolated (real) link.

* Bump relevant vcpkg.json versions.

* Use version-date for cello.

* update version

Co-authored-by: Billy Robert O'Neal III <[email protected]>
Co-authored-by: Jonliu1993 <[email protected]>
* [ffmpeg] Use supports rather than vcpkg_fail_port_install.

* Add missing supports to the ffmpeg feature as requested by @JackBoosY
…64. (#22984)

* [ffmpeg] Block "tensorflow" for the "all" feature on non-x64.

In microsoft/vcpkg#21980 , we removed all the blocks for tensorflow which were merely replicating that upstream's "supports" expression. That is the correct behavior: if upstream adds support for a thing, it should start being tested downstream. However, the "all" and "all-nonfree" features of ffmpeg attempt to turn on what is really "all supported" rather than "all", so the feature-dependency needs to be guarded.

Note that the ffmpeg[tensorflow] feature remains unguarded! It is ffmpeg[all]'s *dependency* on ffmpeg[tensorflow] that is guarded.

* Also guard ass, tensorflow, and fontconfig for uwp
* [OpenCV4] update to v4.5.5

* [OpenCV] bump version

* [gstreamer] fix build for opencv

* fix references

* [vcpkg-tool-meson] fix nuget packaging

* fix references

* [gstreamer] fix references

* [ogre] update vcpkg tools

* fix references

* [OpenCV4] fixes from CI runs

* fix references

* [OpenCV4] force python module also in debug builds

* fix references

* [harfbuzz] fix cmake config

* harfbuzz fixes

* fix references

* [OpenCV4] remove unnecessary lines from patches

* fix references

* fix references

* [harfbuzz] bump version

* [harfbuzz] fix for single config builds

* fix references

* freetype fixes

* fix references

* fix ogre references

* fix references, again

* python when building static windows opencv libraries is unsupported

* fix references

* fix

* refs

* use required when necessary

* fix references

* do not use config for hdf5, use internal module

* fix references

* use proper spelling for freetype config cmake

* fix references

* [OpenCV] restore versions after merge

* fix references

* [leptonica] fix building

* fix references

* do not require package in optional features

* £fix references

* fix python feat

* update version

* update version

* [ffmpeg] remove opengl feat on arm64-windows

* format manifest

* fix references

* fix cuda/nvidia features compatibility matrix

* fix manifest

* fix

* fix

* fix references

* fix references, again

* move CONTROL to manifest

* [gstreamer] bump versions

* fix references

Co-authored-by: Lily Wang <[email protected]>
* [ffmpeg] fix flag handling

* version stuff

* make sure it is the correct flag

* version stuff

Co-authored-by: Alexander Neumann <[email protected]>
* move vcpkg-cmake-get-vars to its own helper port

* manifest format

* version stuff

* doc and version stuff

* add missing include

* version bump

* remove coypright copying.

* version stuff

Co-authored-by: Alexander Neumann <[email protected]>
…priate strip. (#25596)

* Fix failure of cross-compiling for ffmpeg due to use inappropriate strip.

* Update port version of ffmpeg.

* Remove redundant adjust condition.

* Update version database

Co-authored-by: Jamlys Lee <[email protected]>
@omartijn omartijn merged commit 0cda294 into resolume:master Jul 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.